From ed9b1ee75dd914f27351b321d7d1a92a949f06be Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 21 May 2004 17:18:38 +0000
Subject: [PATCH] Fix geocaching tags for input on xcsv.

---
 gpsbabel/csv_util.c | 8 +++++---
 gpsbabel/gpx.c      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index 826890826..5ab7e24ad 100644
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -505,9 +505,11 @@ xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp)
        wpt->gc_data.terr = atof(s) * 10;
     } else
     if (strcmp(fmp->key, "GEOCACHE_TYPE") == 0) {
-       /* Geocache Type - TODO */
-       /* wpt->gc_data.type = gs_mktype(s);*/
-
+       /* Geocache Type */
+       wpt->gc_data.type = gs_mktype(s);
+    } else
+    if (strcmp(fmp->key, "GEOCACHE_CONTAINER") == 0) {
+       wpt->gc_data.container = gs_mkcont(s);
     } else {
        warning( MYNAME ": Unknown style directive: %s\n", fmp->key);
     }
diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 5348dcdb4..50903cd9b 100644
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -518,7 +518,7 @@ gs_get_container(geocache_container t)
 
 	for (i = 0; i < sz; i++) {
 		if (t == gs_container_map[i].type) {
-			return gs_type_map[i].name;
+			return gs_container_map[i].name;
 		}
 	}
 	return "Unknown";
-- 
2.30.2